bitkeeper revision 1.1041.4.1 (40e49f12Fj3pygWG3LxLQ2tcwBx24A)

Fix common files when compiled without CONFIG_SMP (some x86-specific
files still don't work).

diff --git a/xen/drivers/pci/quirks.c b/xen/drivers/pci/quirks.c
index 4e920c52344e10e85f8bb9bd28ca8332c8bf4b91..71c0bb428d3d176658a1f1df5ef9e070d8860603 100644 (file)
--- a/xen/drivers/pci/quirks.c
+++ b/xen/drivers/pci/quirks.c
@@ -18,6 +18,7 @@
 #include <xen/pci.h>
 #include <xen/init.h>
 #include <xen/delay.h>
+#include <asm/io_apic.h>
 
 #undef DEBUG
 

diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h
index 89e0fc0b5bb4030e2f0ba321ae85adca7856ac48..1c2b24085ae8f930e299b49146db08925dc35d2c 100644 (file)
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -3,6 +3,7 @@
 
 #include <xen/config.h>
 #include <xen/types.h>
+#include <asm/mpspec.h>
 
 /*
  * Intel IO-APIC support for SMP and UP systems.

diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index 8eb30e35ea3c041185f44d47f9f8fd549992cb34..8e4a7ec09389979367a70f8bb0f7fbf57685541b 100644 (file)
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -180,6 +180,8 @@ static __inline__ int get_order(unsigned long size)
     } while (size);
     return order;
 }
+
+extern void zap_low_mappings(void);
 #endif
 
 #endif /* _I386_PAGE_H */

diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h
index ac9cc5292f5bdf7bd778427b0b3dc5bb1b09445b..25c29de2e8018b3f35ead6c743f4de624036f78f 100644 (file)
--- a/xen/include/asm-x86/smp.h
+++ b/xen/include/asm-x86/smp.h
@@ -42,7 +42,6 @@ extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
 extern void smp_send_reschedule(int cpu);
 extern void smp_invalidate_rcv(void);          /* Process an NMI */
 extern void (*mtrr_hook) (void);
-extern void zap_low_mappings (void);
 
 /*
  * On x86 all CPUs are mapped 1:1 to the APIC space.

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 009ce5f5e399647cbb4b99251fa9afd7b4614b61..976a12bbe3e90d99581de5b19e64a55a3d058ebb 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -15,6 +15,7 @@
 #include <xen/time.h>
 #include <xen/ac_timer.h>
 #include <xen/delay.h>
+#include <asm/atomic.h>
 
 #define STACK_SIZE (2*PAGE_SIZE)
 #include <asm/current.h>

diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h
index d7f71b6faefdca9c9179ff400907ce7c4b99e3f1..12885a503744adaa0dbaea4f21a119335ccd4439 100644 (file)
--- a/xen/include/xen/smp.h
+++ b/xen/include/xen/smp.h
@@ -72,7 +72,9 @@ extern volatile int smp_msg_id;
 /*
  *     These macros fold the SMP functionality into a single CPU system
  */
- 
+
+#define smp_send_event_check_mask(_m)           ((void)0)
+#define smp_send_event_check_cpu(_p)            ((void)0) 
 #define smp_num_cpus                           1
 #define smp_processor_id()                     0
 #define hard_smp_processor_id()                        0

diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h
index 206f3c1762bdad1876d9c5d91ee3b2cba4438f9d..b74b5f802fb243849b81c2737514b2acc04c2fba 100644 (file)
--- a/xen/include/xen/spinlock.h
+++ b/xen/include/xen/spinlock.h
@@ -54,6 +54,8 @@ typedef struct { int gcc_is_buggy; } spinlock_t;
 #define spin_trylock(lock)      ({1; })
 #define spin_unlock_wait(lock)  do { } while(0)
 #define spin_unlock(lock)       do { } while(0)
+#define spin_lock_recursive(lock)   do { } while(0)
+#define spin_unlock_recursive(lock) do { } while(0)
 
 #if (__GNUC__ > 2)
 typedef struct { } rwlock_t;